Correct some comments and add support for em* interfaces.

The only functional changes are to allow for em* interfaces.