More use of REVERT_COMMA() fixes problems