Make branch property resolving less eager