Merged [18138]: Fixed problem pointed out by Andy; there's no reason to define the...