Cruft removed.