Get rid of more backward-compat code