Patch together geometrycollection handling for now. Refs #52