Simpe typed static

Updated simple typed static to work with the unified-builtins2 branch.