Add highlights for Java, begin abstracting common patterns