Fully implement expression macro resolving and move expansion macros into sections in order to splice them into the existing section entries