Combining two ordered choices into one in space_interval, plus a further fix of VIhA_clause in the same production (Thanks alanpost).
Merge branch 'master' of https://github.com/Ilmen-vodhr/ilmentufa

Merging local changes with those made online in the meantime.