Tighten up transaction decoding rules

As discussed dexX7 raised some concerns around transaction decoding rules being a little loose.  These minor changes are intended to tighten up those rules.