refactor: Use PEG.js' new $-expressions instead of manual joins, etc.