Static +  public class variables now word correctly.

They weren't being moved outside of the class definition and so they
weren't accessible by any other code.
Also had to add a new state to capture default values for public and
static variables to allow them to be initialised correctly.