Simplest bugfix for new multiple taxonomy code - based on latest branch

This is the minimal bugfix (plus an associated formatting nicity) for the previous pull request #67. Hopefully I've worked out how to do this using Patrick's formatting changes as a base, so this should be a trivial pull. Let me know if not.