First attempt at UserLocalService improvements.