Refactor for clearer correctness/security
1 file changed