Better clean up of registered fields and labels, plus more flexible handling of message source accessor