REL-1811: After last change getFPU does not return null anymore, don't need to check for that.
REL-1811: Final code cleanup, minimal tests.