Ack, user_error in order, fixed.
I thought I made this change days ago\!
Merging all the branches