Fix compatibility of new auto-numberer with legacy registers