I agree it should be refactored (at the very least documented). My changes should just do what the compiler already does (while complaining) though, so I think it is good for now.