Resolve ambiguous methods

Resolve ambiguous method names, simplify various return statements, add
MANIFEST.MF to .gitignore.