Don't lose optional argument in visitor