I think that government would be open to all carefully considered opportunities to improve the bill and would look forward to carefully study any amendments that would be proposed. I would suggest, based on all of my experience on legislative drafting, that trying to cover-off every eventuality through forms of wording will remain a challenge. If the word “incurable” were presumably to be replaced by “irremediable”, if that's a suggestion, then the question would be, would it provide greater clarity?
I'll leave that to others to consider.