t3040 (subprojects-basic): fix '&&' chaining, modernize style