Scenarios: remove trivial wrapper methods

These methods are harmful: they break the code-reading flow, they keep
reinventing the wheel, they give the impression we don't have consistent
names for methods, etc.

"There should be one-- and preferably only one --obvious way to do it."

Change-Id: I758f003c795b656823eb81503e6e052659b257bb
7 files changed