Cleanup previous commit a little bit.