Insanely tiny optimization
Large refactoring in order to avoid merge conflicts with the 1.7 branch in the future
 * This revision will not compile; it does not include the version-specific implementation files