More refactoring - mostly making the interfaces more explicit about what
we actually want to do.
Signed-off-by: NKent Overstreet <kmo@daterainc.com>