Some more fixes for scalars/scalar selectors.