Merge "Move NN_TRY macro out of struct initialization"