FLUID-5439: Fixes to Builder and Enactor in response to Justin's review.
Merge remote-tracking branch 'origin/FLUID-5439' into FLUID-5439