Correcting issues with fall-through logic for Evaluate statements.