Simplify logic a little.
Update usage to reflect the recent changes.