[FIX] Proto custom expression nesting properly handles field variables
[FIX] Proto: Crash with wrapped expressions

From the how-did-this-ever-work department...