Refactor complete, in the sense it compiles.