Tweaks/improvements for beautification, and fix for nested workflows