Simplified skater angle logic, see #77