Fix a couple small bugs in the scoping, paren matching