A bug fix and some decrufting.