Fixed up some fiddly logic re the extended block syntax