Fixing libmarpa reserved name violations found by Jean-Damien: t+