Prefers -i as command-line option over -s

Retain -s for compatibility.
Display a deprecation message when -s is specified.