Dev/kwiver integration

Same for all the `returns` → `return` changes.