Clean up target arguments slightly