ARCify the changes in the previous merge.

2013-02-24, Thijs Alkemade