Merge "Use register numbers instead of register names"