I think this FIXME can be removed (comments above are sufficient).