...where the OSL_FAIL line numbers did not point at the relevant code.

Change-Id: I4d12d63782378cbbc446cdcd77c07676ffc81d78