Modernize package a little bit.