this makes them more recognizable, and also fixes #4630. This is technically a BC break (behavioural change), but since nothing appears to use this functionality anyway except PM itself, I don't think it matters.