Refactor mixin and always redefine proxy/delegate methods