Slightly more paranoid compatibility methods following 058b561.