Improve ownership injection structure

Add types for differentiating between return and non-return injections,
making the logic clearer. Previously included a bunch of nested option
types and was pretty unreadable.

Author: rbanerjee20