Review and cleanup the last commit by Antti.