Simplify test -> indicator averaging, fixes #433