MToS: Optimisations

The MToS implemented and merged by !123 (merged) is a naive implementation of the MToS. Some optimisations can be done, to make it faster.