Simplify and add FIXME. No functionality change.