Revert ampersand translation back to hard-coded "and" and add @todo note.