Fixes nuanced bug in serial defines, hopefully for good...