Finished removing references to raw types now that we're using Java 8