Fix #443.  Fixed issue where default register wasn't always restored
after a switch register command.