This implements the proposal made in #171 and forwards old implementations to the new one with a deprecation message.
Closes #171