Change TyphoonDefinition factory methods to return 'id' - to avoid annoying casting