Fixes to simulation staging mechanism

This is my current, work-in-progress branch for fixes to the simulation staging.  I'll let you know once I think it is ready for merging...