handle identifiers properly