We're waffling between using an Oxford comma and not. Let's pick one and be consistent.