Minor performance optimizations
5.0.0-beta22