Half-done functional changes.