Improved null collection initialising, still some un-handled scenarios.