Went ahead and replaced user_defiined_1 in C code.  Closes #141