Further improvements in 'load'.