Reupload of a partial fix for #73 to isolate them from the more substantial changes that have since occurred in my branch.