Improve autoclosing mappings