More phasing out of DoorData var in attempt to fix #1251