Simplified eval behaviors. Removed watches stuff until we need it