Add comment; clean up lint warnings about receiver names