Avoid resolve/normalize against certain keys; fix
0.2.5