A few potential bugs were removed in the process. Much code cleanup remains to be done.
I thought I fixed this already.