Remove inline assignment in if block

Closes #431
Fix: Incorrect Multiple terms validation

Closes #413