Minor cleanup
Big improvement to import mechanism of core items, as a candidate fix for (#119)