Eliminate dependency on commons-beanutils