Fixed callback, using None for opaque value causes it to be omitted from call. Move some comments around.