Cleaned up some code.

Tidied up the old mounting code which doesn't work but needed to be
neater for when it does work to make it easier for people to work on.