Update :endpoints for full Java 7 compatibility