EAGLESIX-2651: Expression: fix minor style issues