BUGFIX: With union rename.

Also use a macro for building a LSB address from two bytes.