Match layout in package proftools more closely.