Thanks guys for working together on sorting this stuff out. I haven't been keeping up at all with the changes to these files.
ZoriaRPG, please don't forget to send patches for master as well as 2.50.x (also for the door fix you submitted a few days ago). Otherwise the next version of ZC will have delightful regression bugs...