Merge "Don't create bump pointer spaces unless necessary."