Move syntax overriding to after/ as well