More endpoint style tweaking.