Refactor scalar formatter

Removed some of its own logic in favor of extending NormaliserFormatter to
benefit from shared logic.