Fixing all extant warnings and adding block syntax.