Code factorization in commit 34fd1234 reintroduced bug fixed in 0d396abf with non-equivalent factorized tests.