Refactor expressions.
Add missing include.
Refactor expressions.