If I may, I think our objective here should be not to clutter this book any more than it needs to be cluttered. There is a clear opportunity to modify. Under section 2, remove the word “motor” which would include the word “vehicle”. A bus, paratransit vehicle, and a taxi cab are already defined as a motor vehicle.
After the words “muscular power” all you would do is remove the words “but does not include rail equipment” and add the words “and includes train, subway, tram, and ferry”. Otherwise, a police officer would have to look up two different definitions of what a vehicle or a motor vehicle might be. We're trying to make it more simple, not more complicated.