Fiddling with types and comments.