Small cleanup here and there.