Make the {include} macro safer, and allow it to work with composite puzzle sets too.