change call signatures for python 2 compat
singleton keyword args now directed toward properties dict, but None still goes to data