Minor code optimization; ensure type traits always applied correctly