Tidying up FSI code. More will follow.

Tracker item: 2293