Changes to block syntax at @MrKireko's behest