Get rid of obsolete syntax hackery