Fair enough -- we should go around and fix this in the rest of the code as long as it's all supported in 2.5?