Minor cleanup in ExpressionCompiler