A couple of substantial cleanup fixes: