Remove 1.8 compatibility stuff some more.