Expression fixes.