Made existing code look more api-like.