Partial fix for bug #108 (Fixup cleanups).