Ref #184: Mostly Through Generic Implementation