Move source/timestamp so it only occurs on leaf nodes