Fix for generation of return statements in constructors