wally: Minor internal, cosmetic code consolidation