Work around clang bug
Remove incorrect NULL
Remove unused members
Update requirements, add clang 3.1 support