Reduce unneeded differences between site handlers