some trivial micro-optimization
Merge branch 'master' into buddypress