Changes to allow type constraints for statements