Pull request review

Review this diff for correctness and security. List blocking issues with file and line, then any non-blocking suggestions. <paste diff here>