Minor cleanup of Garli code