Tweak to get things to compile (fixed merge conflict).