Pull in harmless 1.8 compatibility changes.