Errors in presentation API logic found by Thomas Lumley during explanation. Fixed.