f11b87ebf1
These are fairly trivial to resolve and most of the changes entail using RESULT_UNKNOWN over ResultCode(-1).