Better spec handling.