Improve Expression de/serialization behaviour #676