Small extending-servant fixes.