Fixed problems of last commit.
Set Identifiers' reference to their declaration instead of type.