Simplify generics on A+ implementation
Merge branch 'simplify-generics'