OSX 10.9.5 compile fixes - part one
OSX 10.9.5 clang++ loves nil more than ever

#undef nil // for sigc++ compat does no longer work as expected.