Fix some merge detritus left from Mark's b-c patch
Try out Mac fix (bug 989563).