assert block layout in solver, cleanup 80f462a

Also introduce short variable names to make the code more readable. This
cleans up 80f462a.