don't happen when inlining the functions. This should go to the 1.0 branch This commit was SVN r7921.