small cleanups while verifying that #8 is fixed