Make this more idiomatic
Remove redundant return
Add test for String#get_make_var