We should document the strategy we discussed for deprecating/overriding v1 stuff in v2.