Simple changes for less hash access.