Adding optional value squashing.