Added the ability for elements to change their type for type resolution.

Issue: FMA-28
Change-Id: I09984688b4f673863aec19884cfffbf6f9fb0b14