switch some vocabs to 4 spaces.
math.functions: whoops, back out mistaken commit.
match: fix test syntax.