Removes calls to prototype.constructor

Resolves #1338