Minor additional cleanup after scenario loop addition. No changes in results