Minor refactoring
Implement rwbarton's syntax proposal