More repeated code elimination