Move scoping to a self-cst pass

Create a self-cst pass (move the other one to 1 number). Move the scoping file from the parser to the self-cst