Better plain object handling on singals.