0.4.7: Better arguments, removing useless imports.