Revert "Merge pull request #7 from dimbleby/RankNTypes"

This reverts commit b27dd44624d45e4f025525b0c834136e35cbda52, reversing
changes made to 4bb505c895c73945d7affe8cfb7cd9c13612dabd.