Clean up ill-advised or unusual header guards