EG: refactored; one test now fails... C-only...