Added ad-hoc expression handling.