Minor simplification of value expansion algorithm.