Should allow returning self easily

Fixes #304