In the previous implementation was so unsafe that the ARC
compiler was not able work properly and printed a warning.

While there was no real problem here, switch to blocks to
silence the compiler and see potential errors earlier.