Cleaning up singleton traces in the remaining code.