Unit.h: reorder/redundancy--