Wrapping up* #117

See github/Mantle#117

:custard:

*famous last words