Add generic type param to VariableScope declarations