Misc. refactorings to converve line space. Fine spot to roll back to if needed