Fix #150, #159, #216 - Improve syntax def