Preserve original constructor. Fixes #62. Fixes #107.