Move to a more Ruby-like approach.