dibyendumajumdar Various fixes to defer statement implementation