make one-pass parsing for object identifier
4 files changed