In light of #231 and #205, I'm going to do a complete review to ensure there are no more such bugs from my rewrite in #163.