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