Merge "Cleanup of redefinition testing"