Did some further fixup to standard_values to prep for a switchover to strict mode.