Simplified client message handling even more