consul: Minor cleanup