Another way to detect and reject expansion titles, other minor cleanup