Converted to NeoBundle + some cleanup.