Minor cleanup for Optional/polymorphic handling