More logicial order. Move space saving step to just before it is used.