There was a patch for fixing #1 with new syntax for the next version on the mailing list, so perhaps in a year this'll get fixed?