#341 qualifier note
#337 refining reverse mappings