Identifiers parsing improving.