Couple of small refactorings in Unit from joelq