Use latest markgen, use callables for tag mappings, and handle whitespace