Cleanup the definition of expression depth

Addresses issue #92.