Tided up some pieces in the prior commit.