more playbook optimizations for issue #888