@twpayne, you said to me you'd add a fixme or at least a comment here.