Eliminate forked ScopeIndentSniff in favor of original upstream Generic

Fixes #161, #249

Partially fixes #237, #247, #235.