Final pre-v2.x deprecations

Fixes #289.