Finished better type comparing for #11 -- it's still broken but better
More work on #11
Unwrap expression functions