Attempt changes I mention in #185; testing how they affect our code base