Refactored expression splitting and evaluation