remove old inline cruft

fewer macros = better