The new framework for tracing makefile inclusion has a bug. In the Make[Include|Snippet]End.gmk files, the variables THIS_INCLUDE and THIS_SNIPPET respectively are restored from the HELPER_STACK variable. The problem is that we can't know if the next item on the stack is the previous "include" or "snippet". In a complex tree of includes/snippets, this can cause the wrong custom -post file to get included.

My proposed fix is to split HELPER_STACK into two variables, INCLUDE_STACK and SNIPPET_STACK, so we keep track which files were includes and which ones were snippets. When printing indentations we just concatenate these variables to get the total stack size.