Merge change 184105 (addition of const) from scheme.c to scheme-advanced.c.