The Introduction of Non-Dispatchable Technologies as Decision Variables in Long-Term Generation Expansion Models