Some better type safety.