Get rid of most compatibility hacks.