Move more components over to using options objects.