Simplify API, remove 'whatIf' duplication