Include comment avatars as well.