Update for 10.9 (Python no longer in SDK)
NBBSwappable: fix warnings about parameter type
Address some warnings.