reduce dependency on arch-specific defines