fix a framework-loading problem on Linux, add some extra braces out of paranoia