RE: More type safety in Core?