Corrected two errors introduced by the renaming (and the subsequent

style corrections, I presume), found by Jack.  Added warning that this
has not been tested (Jack could only compile and link it).