More refactoring to for clarity/expressiveness.