Ensure mount options in remount come before special + node.

Fixes calls to mount where an fstype is specified.