Open_class_category tag fixes

Some fixes for the open class category tag (as well as the original relevant commits). Addresses the comments raised in 0abfce68ebaf69e9b0fb264204346a856f4d59a8.

@pteromys, @jmoldow -- Can you take a look over these and let me know if the changes looks good?