Cleanup spec use statements

Second of a few pulls to replace #6.