Removed all shorthand logic.  Extract is now just index-based.