Minor cleanup as proposed in #3406