Cleaning up output.
Fix for old style call for short form, no target (yet).