Improve subscript handling in pret-lam.