Bug 21877: (RM follow-up) Move space into conditional