Hook up existing key-value annotation file mechanism to Java API
Clean up silly extra brackets