Metamorph: fix erroneous channel counts (rebased onto develop)



This is the same as gh-387 but rebased onto develop.

----

This is what edfc130ef90eb70cb1ad54a9e8450fcd7a84fbec should have done
in the first place.

Should fix the metamorph test failures introduced by PR #373.