Re-vamped macrosyntax: Blueprints, ending statments and blocks