Code corrections to work with Kiama 1.6