Simplify the logic about when CLI args are present