Partly de-linted code.