Minor housekeeping. See changelog for details.