Right. Didn't think through this with the changes you made. I'll remove the FIXME.