Renamed more '*_mark' variables.