tc35815: Improve BLEx / FDAEx handling