I plan to do it in another commit (number 12 in my current todo list) as we may use INF and MANY which have semantic differences.