Yeah - I believe the convention now is to look at warranty work as a form of 'service', though that was not the case a few years back.
It's sorta like Customer Supplied Product used to mean stuff consumed in the process and/or product - Now includes returnable packaging and such.