Fix code for Xcode6.1-GM.

See also #5, #6.