consul: Minor cleanups