Don't lose optional argument in visitor
Merge branch 'master' into mammoth