Code cleanup, introducing another bug.