REF: don't use class-level variables per review request.