Cleaned up usage of JavaConversions._, possibly fixed a bug it might have been causing