Working on the awkward Forge stuff.

Also, the "unsafe" Util class methods are tested and are safe now.