4417f78e91
Replace some more paths with diagnostic items cc #5393 Replaces the macro & mem paths, and catches a couple others that were unused changelog: none