- Partitioned off vector monad-ness from caller.
- Created helper method to make testing a bit easier.
- Broke out some code in aggregate to make the map code less verbose.