Cleaned up type-eval on if statements.
Merge branch 'master' of https://github.com/ahaven/6.945-Project