Fixups for Handler removal.