Tweaks to help, nested command stack support