Less macros, simplify \o/