Issue #2 - Implement context sensitive expression skips