Resolves the null issues yin is having right now... I think. Doesn't seem to create any regressions in the simpl tests. Also squelching failures for a few deferred pieces of functionality.