Resolve some interestingly obvious oversights to properly manage multiples.