More un-hardcoding.