Hopefully final changes to 1.9.3 syntax.