Miscellaneous fixes
Remove unnecessary if blocks from constructor
Check for TWave object in __add__