This one's a lot lower priority than the fixes of course :) but while we're making the code pretty, I think our coding standards discourage constants other than 0 or 1 in code...