fix review comments

Try to make the shadow variable macro comments clearer.