More cosmetic abstractions