Fix up argument passing/handling now does the right thing (tm) for uri and adminlists, need to implment uri and adminlist handling in newly defined callbacks.