Internally mark code (as before)
Switch Agda version back again
Add stmaryrd back