Two more hardwired constants swapped for defines. Not tagged.
Attach a file by drag & drop or click to upload
