minor cosmetic changes
refactored block scope handling, cf #883
added block of statements support without prefix token, cf #883