Fixup bare register names

Just a few remaining bare register references.  Maybe we should privately inherit from `user_regs_struct` so we don't get any more of these?