Fix so candidates and prefix include initial delimiter (i.e. " or <)