subr-x is 24.4 specific, so drop usage for compatibility