Ensure common params are added to constructor def, resolves #656
Ensure hints do not block correct types in returns, resovles #657