Add a fixme and reformat.
Collapse logic and move and reword comment for clarity.