coresubs.t: Minor clean-up