[z2628] Improve some static code. Also cleanup npc_doctor and npc_injured_patient script

(based on commit 86b2bbc)

(based on commit SD2-TBC[s2664] - d76beaa)