Attempt to introduce more lapplys

To speed up things, but not sure whether this introduced an error in
the file, please do check ;).