Builder no longer returns expressions