Fix typo that caused encoding to ignore saved regs
Rename to more intention-revealing name
Fix baffling comment

See 9d759146
Add missing commits from #3770, lands #4393