Minor refactorings to make UglifyJS happy