Improve for <nowait> mappings