While this patch is fine as it stands, as discussed with Mike offline, this change is in the TCB and would be safer if RenderContext controlled whether fixup will be applied or not (as in the first patch set) rather than applying it unconditionally.
http://codereview.appspot.com/4591043/
