Expand 'new' calls.

Fixes #240 and #248