Respond to @tixxit's review comments.