Personally I tend to accumulate constants at a central place, but in this case you may be right (I moved them back).