Remove more hard-coding.