• Add modified files not added in last commit. Part of util code refact…

    …oring.
    Josh Aas
    Josh Aas committed Apr 16, 2013