Rework how overrides is accomplished

Yeah, this code was pretty much broken. Now it should apply overrides
as expected.