Both APIs need clarification, so dedupe the changes. We should also probably deprecate some of this stuff so we can eventually remove it.
Travis Ralston