Remove obsolete FIXME for #5762, and fix a typo