Make statement ctor protected
Clean up imports