nicer name-conflict restarts for common cases