Account for scope resolution (#22)