SrmRideFile fixes

works with my pool of intentionally broken SRM testfiles.

Details are in the individual commits.