Use Monoid in a few more spots