- Fix weird unnecessary elements in regex
- Generate qualified module name
- Avoid dubious abstractions