A round of housekeeping with (hopefully) zero functionality changes.