will address laterAll the testing for this diff came from its use in D5557. In that diff I was able to implement the layout actions using the appropriate type defs that I created in this diff, and I received no flow errors which I believe to be a good indicator that everything is correct.