Added nice handling of squares, and the micro-prefix corner case