OK. I'll add a FIXME annotation. Or even refactor it if I come up with an easy solution.