Awesomatic integration cleanup in response to comments in pull request.