Just read code and saw inconsistencies in variable decls and stuff. Signed-off-by: Alexander Morozov <lk4d4@docker.com> Upstream-commit: 01112989b71523df006b00f66b8585a18f634add Component: engine