Slight refactor to remove unnecessary include and crtp.