123531: Cleanup: use strict, no hard-coded values.