Move to Kiama 2.0 for main code since parser is relying on it