GitHub #165: Minor cleanups as debugging this starts