More cleanup of lowering.