-- fixed kiama dup error in ExtractFunction