Updates for new cl-6502 package layout.