Syntax changes for 1.8 support.