Fixes #5915

Also allows checking remaining engine charge by examining, and removes
the verb.
Merge pull request #5924 from mwerezak/train

Fixes #5915