Change behavior for -s and -p. Allow either or both.