Agreed. That's why I left the FIXME in there. I'm sure I'll figure out a nice way to do it one day.