Handle checking of more complex expressions.
Fixes #11