The rust compiler does some fancy things for us: It automatically finds the right fields if the name of the variable and the file is the same. Lets use that to reduce boilerplate with this patch.