Reducing scope, correcting some package mis-alignment.