This is more in keeping with componentconfig, and lets us add more
options easily in future.