BTW, I think these should be scope=compile so that it works as expected in 3.0 and 3.1.