Some changes that make things more elegant in 6.0,
backported so the code is mostly the same in 5.1,
for easier maintainence.