builder: small code simplification

No actual behaviour changes, just remove extra match statements.