Add _aenter_ helpers to v1 and v2 to allow version-specific functions via 'with ..'

Add _aenter_ helpers to v1 and v2 to allow version-specific functions via 'with ..' #387