Initial response to phab review D38
Fix breakage of deprecated code, removing a method too soon
Address remaining review comments

Mostly concerned with usage example and test driver.
Grammar correction - no code changes