9.34: improved Resolve module.