Some prep work for adding to Package Control #2