Bug 915156 - Part 4 - more cleanups / review / feedback

untabify

Add missing ;

Use a "constant" for the helper atom object