Fixed one of the planned FIXMEs.
Another optimization related change.