Oops, revert to 7135dfb but lose spurious space after "**".