Refactored simple keys so that validating doesn't require popping indents, and...

Refactored simple keys so that validating doesn't require popping indents, and so popping indents (and adding the end map) is independent of when we validate the simple key