The changes to Shape should go into the commit that switches the build to macro-paradise. Please add an explanation for these changes to the commit message.