Added clarifying parens, removed unnecessary boxing