Cleaned up nasty compat defines