Would be sweeter if converted to doxy comments (see michals commit)