Removing more 1.9 syntax.