Improve clean

My first one in a while.  I think this improves clean! a bit and improves test coverage too.