Minor refactors as per discussion at https://github.com/testacular/testacular/pull/317/files