Updated defined block parameters to not use Objective-C keywords.

Also slightly adjusted the formatting for them.