When I was there this weekend a friend of mine (former Imagineer, now does freelance consulting for Disney) told me that there are something like 1,000 different combinations for the ride now, not just four programs, which matches up with the signage I saw claiming you'll never get the same ride twice (which is still possible with 1,000 different programs, but very unlikely ... but not really if there were only four different programs).
The car we had did not have the lapbars, only seatbelts.