Tweak comments and return value.