I think we need to be more careful about copying code from MPL without being very clear on its purpose :)
Let's leave these out until there is a clear need for them.