As a legislative clerk, I can only speak to the procedural admissibility of amendments. I'm not a lawyer, nor am I a legal drafter; to think up on the spot all the consequential amendments that may or may not be needed in a bill based on the hypothetical is not within my job description, basically.
On November 29th, 2006. See this statement in context.