Interim OCD cleanup (plus some list access fixes)