WIP: Handle static fields correctly in Constructors