Prevent load-order issue in constant_scope_for with more explicit use of
constant names
Add around hook to isolate extra constant definition.
Remove dead code.
Add changelog entry.