Misc 1.8 syntax changes.