Reuse defaults in Java bridge; start tidying up KinkRemover