CF-147: Add some explicit type hints