Fix #64: Duplicating constructor code

Yaaay! That's one of the long-standing very difficult bugs!