More EPL debugging, works well now.