Replace struct implementation in 8293d74ec6e3b3e22b6d1f984c6838b478314855 by two local variables