Dug into the remaining FIXME and replaced with comments to document the expected behavior.