Seems to me this should be a default parameter of NULL so you don't have to pass in NULL for all the non-Avatar cases...