Merge "Scenario manager: remove some useless `_list_*` methods"