Improve perf & safety of FromScratch version

The code in FromScratch is missing 99% of the checks that happen in base (checkHandleInvariants and some other checks that happen in withX functions) -- those should be ported to work here as well.