Cleaned up creation of default flows.