Improve generic style support.