5b0c4babe6
Remove unneeded casts, add generic types and make better use of static data Reviewed-by: sherman
Remove unneeded casts, add generic types and make better use of static data Reviewed-by: sherman