Clean up the code; no functional change intended.

ok pedro@