Markups
Move node-specific event IDs into separate header files
Make instance IDs defaultable
Fix compile errors
Merge remote-tracking branch 'origin/sas_integration' into sas_integration