some cleanup of I option handling