Cleaned up a bit the smuggler main program to handle both cases with less code-paths.