Ensure correct scoping of identifiers during checking
Initial identifer namespacing work