Merge "Reduce code repetition in stack maps with macros."