Support for ImageField Avatar

Hello,

I noticed that the Account Profile module overrides the node_form function override of the ImageField Avatar module so that the core user picture field is visible in the form again.
It would be great if there could be a simple if-statement in account_profile.module file for case $profile . '_node_form':

if module_exists('imagefield_avatar') {
  unset($form['picture']);
}

Edit: I think it would be clever to also check if the user has set a cck avatar field already before hiding the core picture field.

Stefan