Only declare variables at block start
Only declare variables at block start

Mixed code and declarations were accidentally introduced
in 6f457aa9e780a8f2675ce118b352cf974f96378f.

Signed-off-by: Derek Buitenhuis <aff7d637ede26ea82e5226e01b697996cc52e526@gmail.com>

dwbuiten/d2vsource,dwbuiten/d2vsource