Small changes in '--interactive' option handling