Fix some more code style issues with block params being in the wrong place