A little note to ourselves - when putting in lines like this we need to use FIXME or TODO prefixes so that we can periodically review them.