Work on #expand_value