DO NOT MERGE - Review Only - Clean analyzer

Since CI seems to be down, this is the whole PR for review by @sjrd. The true PR is in #1412
Define the vars before they're used in the accessing defs.