Refactor last commit a little.