Cleaning up from some old design decisions.