Refactor scalar key/axis detection.
Merge pull request #96 from rhattersley/scalar-types

Refactor scalar key/axis detection.