Prevent load-order issue in constant_scope_for with more explicit use of constant names

fixes #1678