Replace some constants with N_AXIS.

Replace some constants with N_AXIS macro for future axis addition.

There was some white space cleanup by Emacs, sorry :)

Signed-off-by: Alexander Danilov <alexander.a.danilov@gmail.com>