Fixed Java instance-of to work with brands.
Java cleanup.
Merge branch 'dep-mixins'
Fix missing arg to get-raw-field.