Mass bugfix for #21 and #23. Add further peeking to check whether there
really is an operand where there should be.