This eliminates a few variables, and the naming awkardness where we have corresponding but distinct flag and router config variables.
This eliminates a few variables, and the naming awkardness where we have corresponding but distinct flag and router config variables.