A couple of updates to the -i option.