Slightly reduce dependancy on StraightEdge