cosmetic: simplify some constructs