t/t3415: use && where applicable.