In all the excitement, I forgot to change some things back:
FIX: Rounded rectangles are now the default again.
FIX: Error message display corrected for rounded rectangle.
REMOVED: Some code that I'd commented out which is not needed now.
TODO: Grab a cup of coffee on my way up to the 3rd floor.