* Remove line that does an H to S mode mapping as this isn't specified by the manuals.

* Fix the mapping when we access scontext or hcontext to ensure we don't switch targets.
* Add comment to indicate why we are mapping the S to VS and VS to S.