Change behavior of autocomplete

See #49 for details. Not 100% sure I want to ship this in v0.9.0.