More tidying, update Mustache type definitions