Non-breaking MRY optimizations

(With hard-coded SerialVersionUID values)