fixup
test s004 fixes
scalar rewrite fixes
rewrite tests
tests
non-AST build fix
s003 test fix