Make sure container and resolver normalize the same way

This fixes e.g. #84