As for the second question, it's not clear in the act whether liability would extend that far. That's an ambiguity that would require some further research.
The first half of the question relates, essentially, to whether hinging the bill on a numerated list of acts—repair, maintenance and diagnosis—would be overly restricting. Is that the essence of the question?