const correctness
some dump improvements
local pattern to eliminate a useless Enter