Support +I while we're adding modes (part 2) - the missing files.