A few more tweaks.
Switched back to using EndPoints directly for less than functions.