Change all uses of value_for_tag to new non-static syntax