Code cleanup after e5a6f4d.