Clean up identifier parser
Clean up identifier parser

Change-Id: Id980aad7eb3517554559c056ffbbebe653f75a89

apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast