Contuing to replace reg_order with current scope throughout code.