Simplify fix proposed in #164.