Extracted variable access replacement in class VariableAccessReplacer and used it in 2 places.