Re-add short oneliner mode