Some cleanups. cc @LEDfan