Fixed formatting for MR 59 by Scott P.
There's no major regressions from MR59, this commit corrects outstanding issues (Formatting, Not using KIS_SAFE_ASSERT) and is now ready for upstream.