More cleanup of lpad_run.