Clean up question and update specs to use new syntax.
Clean up vector and update specs to new syntax.