ENH: Update Superbuild based on enhancements from NAMIC week.