Merge "Cleanup in mvref_common.{h, c}."