more stable handling of nots and elses
Added test for modifying argument name