Working on #3.  Doing some gymnastics to make sure that we grab the BuildDefinition from the top level plan only, regardless of where the code is being executed.