I could break it apart into individual pull-requests, but thought you might be okay with merging it as is more or less, and then refining it where needed?
Coverage decreased (-0.3%) to 83.624% when pulling f26abb3ed7dbeff6c282bfe9e17f034fb36d5884 on vast into 4931a15d409e3e5e6a3a89464f946bab457dd141 on master.
I could break it apart into individual pull-requests, but thought you might be okay with merging it as is more or less, and then refining it where needed?